merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 7 Apr 2009 02:32:24 +0000 (11:32 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 7 Apr 2009 02:32:24 +0000 (11:32 +0900)

Trivial merge